Prevent double commits, don't commit when Ctrl is present. (#160376,

2004-12-06  Matthias Clasen  <mclasen@redhat.com>

	* modules/input/gtkimcontextime.c: Prevent double commits,
	don't commit when Ctrl is present.  (#160376, Kazuki IWAMOTO)

diff --git a/ChangeLog b/ChangeLog
index b5520afdaee3afea0a8294278524df678f14620c..11d8f8555df128dc1cf66eb57eb004661e308024 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/input/gtkimcontextime.c: Prevent double commits,
+       don't commit when Ctrl is present.  (#160376, Kazuki IWAMOTO)
+
 2004-12-06  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b5520afdaee3afea0a8294278524df678f14620c..11d8f8555df128dc1cf66eb57eb004661e308024 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/input/gtkimcontextime.c: Prevent double commits,
+       don't commit when Ctrl is present.  (#160376, Kazuki IWAMOTO)
+
 2004-12-06  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b5520afdaee3afea0a8294278524df678f14620c..11d8f8555df128dc1cf66eb57eb004661e308024 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/input/gtkimcontextime.c: Prevent double commits,
+       don't commit when Ctrl is present.  (#160376, Kazuki IWAMOTO)
+
 2004-12-06  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b5520afdaee3afea0a8294278524df678f14620c..11d8f8555df128dc1cf66eb57eb004661e308024 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-12-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/input/gtkimcontextime.c: Prevent double commits,
+       don't commit when Ctrl is present.  (#160376, Kazuki IWAMOTO)
+
 2004-12-06  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkcolorsel.c (key_press): Implement keynav for the color

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index da10077d83d59d689f6c0118a750f15525952b65..833cf160b571880de4c8e52ce03e7c76feb7aec5 100644 (file)
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -312,6 +312,9 @@ gtk_im_context_ime_filter_keypress (GtkIMContext *context,
   if (event->type == GDK_KEY_RELEASE)
     return FALSE;
 
+  if (event->state & GDK_CONTROL_MASK)
+    return FALSE;
+
   context_ime = GTK_IM_CONTEXT_IME (context);
 
   if (!context_ime->focus)
@@ -971,6 +974,7 @@ gtk_im_context_ime_message_filter (GdkXEvent *xevent,
               {
                 g_signal_emit_by_name (context, "commit", utf8str);
                 g_free (utf8str);
+               retval = TRUE;
               }
           }